Updated design with tweaks.