pretty masthead
merge with master, again