fixing the issues on live demo site