improved GUI behaviour