layout update and small fix