Fixed problem with user image and overflow
Merge