Added to menu, mostly config
Added to menu, mostly config