ADDED: Refactoring, setting up various containers for responsive layouts