New custom controls, tweaks to design