Settings page and Some variable and class renaming