Settings and Dashboard changes