Cleaned up default view