Adding logged-in template and consolidation of break points