Bit less pagging on bottons so there is enough space when editing
Merge branch 'master' of https://github.com/collex/collex