some style changes
finalize prototype before demo