#287 few more GUI modifications