WiP fixes and minor new features
Menu ordering and minor styling changes
Added 'browse.prioritise_facilities' option
Ready for release v2.0.4
Merge branch 'release/2.0.4'