Final GUI improvements