Getting ready for testing -- changed layout to Core-style