Make stuff prettier (not)
fix routing