Fix comma issue on ST2. Add settings in menu.