Changed Window names, tweaked UI.