Changed demo and demo page