Padding on top of views
Fix merge