Better centralisation of buttons to account for gaps, some bugfixes