Some GUI nice improvements