Added flower, reorged layout
Merge branch 'dev'