Layout fixes, and CSS cleanup