Fix Bugs

Fix UI bugs
remove unused Code
Fix UIBugs

fix uiBugs