Prepare for 2.0 and settings link