Updated and added few javascript