Update handling of bar buttons