Bunch of improvements on app