Tofe/fixes: some fixes for PowerMenu