Move to layout based view system