Added layout and styling change requests from Anand