User interface improvements
Merge pull request #48 from ciaventures/preventRepeatUser

User interface improvements