Some gui fixes

Includes everything from my last PR minus the Knapsack stuff.