Login screen in place; pushes to a new page
Commit before loading new dependencies
Fixed highlights
Resolved conflicts