Cleaned up:
-User avatar, but still need to add ability to change avatar
-Layout