Fixed merge problem

Signed-off-by: Hin Lam <max21226@Hin-Lams-iMac.local>
Power menu bug fix

Signed-off-by: Hin Lam <max21226@Hin-Lams-iMac.local>