Various HTML/CSS fixes and layout adjustments