Fix layout bugs on tablet sizes