Updated files based on comments mentioned. Also working on stripping the main css file to a global base.css