Fixup & some visual changes