First try of refactoring and updated image names for ipad version.