Update handling buttons; update loader