Gallery UI and functioning and fixed some UI inconsistencies

Anurag, you wont be able to see the images I've uploaded neither vice-versa, you have to upload it yourself, and then you can see them.

Also some PEP8 fixes
Resolve merge conficts