UI Changes
Merge branch 'master' of https://grellinn@github.com/Grellinn/Company.git