Some gui changes ..