changed handler/urls layout