cleanin up some code still ugly what ever
Merge branch 'master' of https://github.com/ohSmurfy/user_interface