assets cleanup + minor ux