Some improvements on going
2.1.23

Fixes related to new buttons and menus
Merge remote-tracking branch 'origin/2.1.23' into 2.1.23

Conflicts:
	index.php
	load.php