Adjusted some Parts of the Application