More markup changes ans some style dressing