Improving UI and fixing bugs