Some more restyling