UI fixes for Public Client Layout