Lay-out changes for management part