Flexbox and Forms fixes