Adding filler widgets, fixing build issues