Some updates to gui elements