buttons, loader gif
Merge conflicts solved