improvements in button and header