Clean up view and add more data