Code review

@Kevinwlee I made all of the changes Roberto suggested in his e-mail to me on Monday. Most of the changes you see are related to switching from the Resources folder to Images.xcassets (much cleaner).