Moved views to components