Header button fixes