Fix feedback #33

Also cleaned up the DAP pages