Some cleanup and GUI commands have nicer formatting now