Made minor tweeks to main app