Fix up some spacing, exit on close