GUI improvements, Selection phase more correctttt ++