margin, buttons, fixes