Fix some bugs and some basic styling