Fixed some bugs and some styling