Added JS validation, navigation module, a litle refactoring