Improve GUI performance

Performance issue addressed #153 

work in progress ...