Updated template, added login