Add grenswitch button
Fix some settings