Cosmetic updates to css and error check