Tweaked animation of next/prev icons, code cleanup based on code analysis