Removed aspect and flower bed number from model
Fixing html to reflect changes to the model
Merge branch 'master' into deploy