layout/js cleanup