Fixed bugs, improved UI