Refined the app