Make properties private; rename picker views