Completed restructure, changed shutdown menu