small code cleanup
fixed picture UI
adding ui junk
Merge commit '1d82a98556de57c81f20561365dc0f4e9eb448f0' into providerRefactor