New GUI feedback

Applied changes of #124 again (were reverted, see #135)