Fixed all the errors and add demo site