Minor GUI change for Sprint 3
Merge origin/master