Anil/Deva - Faces page UI changes