improved marking, GUI & added buttons