Added widget and made some minor layout tweaks