Changes to cope with Flexbox issue (final solution TBD). Plus some cleanup.