improved layout. added CMD.