Refactored the remaining controllers

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