fixed layout name issue for none user pages, and readded icon