Changed URLs in the pannel
Better URLs in templates