Flexbox layout fixes
Layout updates; fixes #17