fixes in ApplicationView & Main (due to refactoring of Application)