Minor style fixes
User list refactor, style fixes