Move settings to controller