Done all admin and client end changes

Done all admin and client end changes