Initial design and login bug fixes