Added menu. Fixes etc