Cleaned up Views and nested Views