CheckBoxes are currently easier

Fix build and consistancy look

Change-Id: I94cdaf8f8e8329f34afe5443fabcc0c2dd57f4b5