Add constraint to fix #37
Add some extra padding