Fixed routing and view load issue