Moved images around
Fixes to a few buggy controllers