Changes to main app

Made my changes to the app