demo ready - edited views and video chat portions