Adding correct buttons and adjusting load order