fix header and tweak buttons