bugfix + css fixes