more buttons and removed tags