Merge pull request #180 from Useful-Innovation/johans-fixes

fixed some buttons color and placement