Re-do Dave's changes using LESS