Final fix for checkbox placement