Moved mode select items to more aesthetic positions