UI and Connection changes
Merge pull request #2 from matmat007/Matthew

UI and Connection changes