GUI updates, fixes