Interface refactor
Finishing the new interface
Small formatting changes