Added a basic account system.
Fixed merge conflicts in some screens.