Some code cleanup and css fixes.