Change metrics to list; add button classes