Fixed routing/reloading issues