Fixed bug where other guest and selected guest would not show up & cleaned up code with proper indents