Fix 'no variable' case issues #900

Fix #900 Ordering no features results in inconsistent state
Fix additional button state issues