Cleaned up composite for editing / uploading / viewing apps