UI fixes except landscape view