Added some defaults and fixed up the css