Improve header alignment and menu