Final version - with dev database

Made minor tweak based on app review meeting.