User settings screen

Display the avatar to the left of the file selector.
Fixes #696
Use bootstrap defaults and remove use of id
Merge branch 'pull/266'