Added watch and server with live reload