Cycle 3 - Interface rework

No functionality has changed, interface is just being reworked.