Several changes to pincode view