Menu changes and form fix