Clean up how filebrowser toolbar is built