UI changes
Merge branch 'master' of https://github.com/MarioStoilov/TeamZorro