Application has been refactored. Added more client js