Polished up the app