added andys layout