fixed all references, layouts good to go