Fixing bugs and Improving UI