UI / Formatting changes

This is just prettied up somewhat now.