clean up setup, tweak the default panel