Organised buttons into classes to modularise code, minor UI improvements