Remove router since converted to single page app and Add validation