Add settings screen and some other fixes