added gui elements
Merge branch 'andrew'