UI done and Bugs fix