Streamlined new ContentLoader
HTML layout and nav tweaks