Further changes
Merge commit '0330e7f9ddae2694677ad32cb9172d1b9ccdb904'
Changes to improve the application. Both back-end and Front-end