GUI updates and fixes