UI fixes for User screens