fixed previous commit bug with missing end, totally removed url_for_improved