Handles landscape mode better now