Make active button correct colour
Sort enum choice by value
Add more levels of description