lots of layout and title fixes
production mode