Some changes to GUI, ready for annulus implementation.