Made some adjustments to the app part