Cleaned up media views and controller