Mostly layout and plugin tweaks.