Fixes for landscape mode

I had previously neglected landscape mode as was focusing on portrait
mode first.