work on gui fixing

@wkerzendorf  - work in progress to get guy working. Cosmetic changes still to be made but seems to work now - is this ok?