Yet another cleanup
Nicer side picker rotation (revert if not so nice)