several changes and css fixes