Cleanup

Finalized UI and fixed results output