Fixed some bugs and added some css