Fixed some style issues and converted magic numbers to class constants
Merge branch 'advancedUI' of https://github.com/MinionApp/minion into advancedUI

Because GitHub is stupid.