Fix image width in user profiles

Images were too wide in most cases causing horizontal scrolling to
appear.

Cleanup some hacks

Change-Id: I019f4be81187187b1de8d7ce0da19ca199b9bb4c
Merge "Fix image width in user profiles"