Refining button layout and trying to optimise memory usage