Cleaned up initial view