misc: fixed layout bugs