Restructure into web form