Refactoring
Make some more breakpoints for the base template