Css/styling

merge conflicts fixed