CSS/HTML layout and code cleanup