Finishing merge with gtk-builder; re-added UI elements and hooked up callbacks