More user interface tidy up
More user interface clean-up and standardisation
Added the display of annual yield; also added the calculation of annual yield