Completed ui interactions
Merge branch 'master' of https://github.com/CamW/garden-pi