Moved setting buttons back into a row