Big content changes, got rid of a few views and combined to main view.