Half-way to setting menu

+ other minor fixes