Big epic GUI refinements...