New css structure, few changes on design