Fix layout bugs cross Android/desktop