Redo system to do two usernames per row in database. Not as scalable, but much simpler. Fix some styles