Fix #34 - improving url mapping for system page