New layout

Pull merged changes to master