Fixed some small bugs and updated CSS