Manual Merge

We had trouble push up new commits because they contain large image
files. Git will ignore the images and we will move the images over
manually.
Widget Fix

Missed a close widget line.