GUI updated

Best so far....