Better settings and link control type

Change-Id: I9dc92e8c91088525efba8add82dd223f5ef3541a