Fixed errors and bugs, improved UI