Misc Tweaks fix

-fixes not being able to select some options
-no more system ui reset when selecting contextual panel header

Change-Id: I7cc4c555b9b65c325f9703ea4260e36cfd7293fc