Aesthetic changes, code cleanup, a bit of refactoring
TODO: figure out why domain label isn't showing