Less Fluff again

Too many buttons