Fixes clickable areas in button-lists
Merge branch 'master' into squares