rm remix btn. other improvements kept