updated ui and bug fixes
Merge pull request #13 from OwenMcGirr/develop

updated ui and bug fixes