Removing the multi-scroll slugfest and going to a simpler layout