rebuilt app using scaffold with the base fields.
Merge remote-tracking branch 'origin/master'