Fix spaces alignemnt+ additional replacments