Finish tweaks to design