Removed some coupling between gui elements.