Fixed bugs and polished up UI. Everything seems to be working :)