Overlapping buttons

[mokelly]

The update fixes all layout issues. Thanks a bunch!