Refactors and allows for default value to be displayed if no current party exists