Fix for small monitors ...

and re-sync with oe-a fork