Fixed bug with scrollers and cleaned up silly coding