Ui and feedback changes
Ui and feedback changes
up to date
pulled and merged
Template to client added