Sumeet/77 header buttons 2

@tkuldeep Could you quickly review this? Thanks :-)