Fixed problem with incorrect padding (which pushed views out of the screen).
Merge branch 'padding_fix'