improved UI to better blend with latest WP
cleanup js