Tighten up design of header bars and buttons