UI changes, added commands
Work on UI (commands)