* removed the float on swatch fixes alignment and overflow issue. Change-Id: I5a9ba35ce833af58cdafdf3f47add93f03024236 Closes-Bug: #1403660