used even more image catalogs to handle assets, cleaned up some commented out code, replaced some code and made the whole thing better for iOS 7