impl. new screens, fixing UI