Completed search and company template overhaul