Initial redo of v4 styling