All the tidying up!!! Moved menu entry widget to a proper location