buttons, header elements, more restructuring