Added start/stop
refactoring
UI changes