Changed the way layouts look for servicelocator