This refactors our carousel control a bit, it was getting messy Signed-off-by: William Casarin <jb55@jb55.com>