Refactoring + Login template added