Add next/previous stage links
Remove unused code
Convert tabs to spaces