Cleaned up Views a bit.