Fix Reboot menu and other Stuff

PS2 : Removed dependency

Change-Id: If761a6cdff41d1531e8586d9abf9730767da7149