Updates to app

Work around for web sockets