Re-style, update content and clean up