Changed background and borders
Merge branch 'master' of https://github.com/ohSmurfy/user_interface