Fixed line identations
Added return links for login and logout actions
Login and logout URLs are changed for CERN environment