Tidy up GUI, add new axis window