Some reformatting and adding Login template