UI styling
remove merge conflict
Merge branch 'master' of https://github.com/casecode/PlantAlert
resolve merge conflict