Improove responsive flows