style and flow changes
actually fixed styles