Fixed the issue with some settings and formatting on settings page