Dialogs nearly complete; working on layouts