add create room button and modal
merge fix