modified controller and UI
Merge pull request #5 from girb0t/alex_shit

modified controller and UI - not complete