Added UI and Fixed Connection issues further