reduce spacing, arrange elements, remove abused buttons, #15