Tools drop down now looks correct, also other layout tweaks to match designs