progress on re-style