organizing components display 

Merging style changes to test