UI: Improve masthead, simplify code