Security fixes & design updates