Merge branch 'master' into Dustin
Summary padding, ui fixes for tear off and adjustments.
Merge branch 'Dustin'