Some refactoring, fixed a few small issues
Fixed a formatting issue on the key relationships display