Update with new css and bug fixes