moved a couple of methods that were inside layout into layout info