Resolved remaining merge conflicts and expanded on Status dialog (a bit)