Moving selector and minor fixes