Latest changes for the last steps of the website