new css and grid layout
conflicts resolved