Pushing Changes to Master

- Complete Unit Settings Dialog