Improved rotation + placement after rotation