Added login, cleaned up counties