Add master.css, some cleanup