fixed public header & toolbar