further css and structure changes