Adding waitlist support to UI. Address Issue #49