Added layout class