fixed some ui problems
Finish bug-fixes