Some changes/updates to the GUI