Update header to include dropdown menu
Tidy up code