Fixes in application

In Progress