fix rendering & routing