take the changes for all Apps

I splitted my changes related to Issue #105.

This PR contains all changes related to the Apps.