Refactoring. Redundancy css fixes. Style changes