Added User layout and search