GUI menu progress, slight fix for Pie
Resolved conflicts... please let me commit this.