#477 Fix on off button row layout