cleanup on some js and buttons