[Display] Added "Set as Primary" button
[Display] Remove more dead code