Polished the app a bit