Added some logic for user

Next: styling!