Changed background and borders
Merge branch 'master' of https://github.com/ohSmurfy/user_interface
fixing conflicts
API is showing
fixed conflicts
Merge branch 'master' into kyle
fixed conflicts hopefully for real this time