Refactored the remaining controllers

Refactored into a single class.  App performance and image loading
seems to have greatly improved.