Final redesign and CSS refactor