Fixed so that the app has a decent UI