UI Tweaks
WIP
Fixing image loading and tests