Slight re-ordering of function calls when using the settings menu