made UI changes to listview
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
made some layout changes
merged with james
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
Merge branch 'master' of https://github.com/UpstreamApp/Upstream