new model and minor bugs fixed

Refactor code to update message content and labels in FlaskApp and dashboard templates