Updated css, fixed bugs