More tweaks to view rendering. Double headers should be gone now.