Fixed small layout issue
Can now upload a profile picture
Merge branch 'uploadable'
Made it look a bit better