AT changes to layout page
Fixed conflicts. Updated layout and user view
Updated application layout and item show