Final GUI changes