Fixes in Website Route system and other misc fixes