Redesign and CSS cleanups