Use inline documents in menu and simple forms + fixes