Updated layouts and added elastic search.