Fixed echo and added spacers