separate padding right for buttons
Merge branch 'user_settings' of github.com:droidlabs/motion-prime into user_settings
remove styles blocks, UIButton padding right, small fixes