more flexible template inheritance
conflict resolved
login page