More refactoring; Section added for registered users