Menu added and linked

A few bugs fixed