Changed application layout
Refactoring and Hotfix for flash nortifications
Tests Quick Fix