Fix slider logic, reduce numslides, clean code