Update application style
Fix after win
Merge branch 'solution' into solution2
Merge branch 'solution2'