A little tidying up
pulling out classes for the ui navigation