Update & Fix grunt serve task