Add code that lets you specify a layout file as query parameter.
Minor typo changes and update todo list.