Added layout and register