Updated flexbox and settings