Fix bugs and perform basic styling