Cleaned up view table