View overhaul merge