some style and flow changes