Added header buttons, some changes.