some style updates and some markup changes