Cleaned up views. Trimmed features for now.