Fixed calls to flex mixin
Streamlined