More viewport improvements