Routes fixes + classes back