Realigned outputs
Start on moving all outputs through display