added settings table
merged remote changes