Moved positioning logic from thumb to switch