cleanup layout, headerBar templates / styles