Improved structure for writing GUI functions

used variable better to parameterize
Merge branch 'ui' of https://github.com/alex-ozdemir/shanahan-rooms into ui