[MOD] Smart buttons added, to improve functionalities