Added link to login button
Fixed merge conflicts