Relocated base.html and fixed templates